From a1991df8d31825da2d7e91a83f2281086a41813f Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 14 Jun 2014 11:00:33 +0200
Subject: [PATCH] Adwaita: darker base color for the dark variant

---
 gtk/resources/theme/Adwaita/_colors.scss      |  4 +-
 .../theme/Adwaita/gtk-contained-dark.css      | 98 +++++++++----------
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index 8e4e5b8540..2541103ff0 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -2,7 +2,7 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: if($variant =='light', #fff, #333);
+$base_color: if($variant =='light', #fff, #292929);
 $bg_color: if($variant =='light', #ededed, #393f3f);
 $fg_color: if($variant =='light', #2e3436, #eeeeec);
 
@@ -29,7 +29,7 @@ $insensitive_bg_color: mix($bg_color, $base_color, 60%);
 $insensitive_borders_color: $borders_color;
 
 //colors for the backdrop state, derived from the main colors.
-$backdrop_base_color: if($variant =='light', darken($base_color,1%), darken($base_color,5%));
+$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
 $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
 $backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,5%));
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 78463389f5..c659b3c3e9 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1,15 +1,15 @@
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #eeeeec;
 @define-color theme_bg_color #393f3f;
-@define-color theme_base_color #333333;
+@define-color theme_base_color #292929;
 @define-color theme_selected_bg_color #215d9c;
 @define-color theme_selected_fg_color white;
-@define-color insensitive_bg_color #363a3a;
+@define-color insensitive_bg_color #323636;
 @define-color insensitive_fg_color #939695;
-@define-color insensitive_base_color #333333;
+@define-color insensitive_base_color #292929;
 @define-color theme_unfocused_fg_color #c9cbc9;
 @define-color theme_unfocused_bg_color #393f3f;
-@define-color theme_unfocused_base_color #262626;
+@define-color theme_unfocused_base_color #2c2c2c;
 @define-color theme_unfocused_selected_bg_color #215d9c;
 @define-color theme_unfocused_selected_fg_color white;
 @define-color borders #1c1f1f;
@@ -30,7 +30,7 @@
 @define-color wm_button_active_color_a shade(#393f3f, 0.85);
 @define-color wm_button_active_color_b shade(#393f3f, 0.89);
 @define-color wm_button_active_color_c shade(#393f3f, 0.9);
-@define-color content_view_bg #333333;
+@define-color content_view_bg #292929;
 * {
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
@@ -95,7 +95,7 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:insensitive {
-    background-color: #363a3a;
+    background-color: #323636;
     color: #939695; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
@@ -103,10 +103,10 @@
 
 .view {
   color: #eeeeec;
-  background-color: #333333; }
+  background-color: #292929; }
   .view:backdrop {
     color: #c9cbc9;
-    background-color: #262626; }
+    background-color: #2c2c2c; }
 
 /*********************
  * Spinner Animation *
@@ -135,38 +135,38 @@
   background-color: transparent;
   border-style: solid;
   border-width: 1px;
-  background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+  background-image: linear-gradient(to bottom, #212121, #292929 90%);
   border-color: #1c1f1f;
-  box-shadow: inset 0 2px 2px -2px #191919, 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 2px 2px -2px #141414, 0 1px rgba(238, 238, 236, 0.1); }
   .entry:focus {
     background-color: transparent;
     border-style: solid;
     border-width: 1px;
-    background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+    background-image: linear-gradient(to bottom, #212121, #292929 90%);
     border-color: #0f2b48;
-    box-shadow: inset 0 2px 2px -2px #191919, inset 0 0 1px 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 2px 2px -2px #141414, inset 0 0 1px 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1); }
   .entry:insensitive {
     background-color: transparent;
     border-style: solid;
     border-width: 1px;
-    background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+    background-image: linear-gradient(to bottom, #212121, #292929 90%);
     color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #363a3a);
+    background-image: linear-gradient(to bottom, #323636);
     box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
   .entry:backdrop {
     background-color: transparent;
     border-style: solid;
     border-width: 1px;
-    background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+    background-image: linear-gradient(to bottom, #212121, #292929 90%);
     color: #c9cbc9;
-    background-image: linear-gradient(to bottom, #262626);
+    background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
     border-style: solid;
     border-width: 1px;
-    background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+    background-image: linear-gradient(to bottom, #212121, #292929 90%);
     color: #454c4c;
     background-image: linear-gradient(to bottom, #393f3f);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
@@ -264,7 +264,7 @@
     border-style: solid;
     color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #363a3a);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -273,7 +273,7 @@
       border-style: solid;
       color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #333737);
+      background-image: linear-gradient(to bottom, #2f3333);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
   .osd .button {
     padding: 6px;
@@ -352,7 +352,7 @@
       border-style: solid;
       color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #363a3a);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -404,7 +404,7 @@
       border-style: solid;
       color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #363a3a);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -541,7 +541,7 @@ GtkLinkButton.button {
     border-style: solid;
     color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #363a3a);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -577,7 +577,7 @@ GtkLinkButton.button {
     border-style: solid;
     color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #363a3a);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -755,7 +755,7 @@ GtkComboBox {
         border-style: solid;
         color: #939695;
         border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #363a3a);
+        background-image: linear-gradient(to bottom, #323636);
         text-shadow: none;
         icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -813,7 +813,7 @@ GtkComboBox {
           border-style: solid;
           color: #939695;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #363a3a);
+          background-image: linear-gradient(to bottom, #323636);
           text-shadow: none;
           icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -851,10 +851,10 @@ column-header .button:backdrop {
   border-color: transparent;
   box-shadow: none;
   border-radius: 0;
-  border-image: linear-gradient(to top, #272929, #333333) 0 1 1 0;
+  border-image: linear-gradient(to top, #222424, #292929) 0 1 1 0;
   background-image: none;
-  background-color: #333333;
-  color: #90908f;
+  background-color: #292929;
+  color: #8b8b8a;
   text-shadow: none;
   font-weight: bold; }
 
@@ -877,7 +877,7 @@ column-header .button:backdrop {
 
 .menu {
   padding: 0px;
-  background-color: #333333; }
+  background-color: #292929; }
   .menu .menuitem {
     padding: 4px; }
     .menu .menuitem:hover {
@@ -889,7 +889,7 @@ column-header .button:backdrop {
         color: #454c4c; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
       color: #c9cbc9;
-      background-color: #262626; }
+      background-color: #2c2c2c; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
 
@@ -967,7 +967,7 @@ GtkPopover {
  *****************/
 .notebook {
   padding: 0;
-  background-color: #333333;
+  background-color: #292929;
   -GtkNotebook-initial-gap: 10;
   -GtkNotebook-arrow-spacing: 5;
   -GtkNotebook-tab-curvature: 0;
@@ -977,7 +977,7 @@ GtkPopover {
   -GtkWidget-focus-line-width: 0;
   transition: all 200ms ease-out; }
   .notebook:backdrop {
-    background-color: #262626; }
+    background-color: #2c2c2c; }
   .notebook.frame {
     border: 1px solid #1c1f1f; }
     .notebook.frame.top {
@@ -1181,7 +1181,7 @@ GtkSwitch {
     GtkSwitch.trough:insensitive {
       color: #939695;
       border-color: #1c1f1f;
-      background-color: #363a3a;
+      background-color: #323636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1);
       text-shadow: none; }
     GtkSwitch.trough:backdrop {
@@ -1216,7 +1216,7 @@ GtkSwitch {
       border-style: solid;
       color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #363a3a);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1375,7 +1375,7 @@ GtkTreeView.view.check {
     GtkTreeView.view.check:selected:active {
       color: white; }
       GtkTreeView.view.check:selected:active:backdrop {
-        color: #262626; }
+        color: #2c2c2c; }
     GtkTreeView.view.check:selected:backdrop {
       color: rgba(201, 203, 201, 0.1); }
 
@@ -1520,7 +1520,7 @@ GtkTreeView.view.radio {
     GtkTreeView.view.radio:selected:active {
       color: white; }
       GtkTreeView.view.radio:selected:active:backdrop {
-        color: #262626; }
+        color: #2c2c2c; }
     GtkTreeView.view.radio:selected:backdrop {
       color: rgba(201, 203, 201, 0.1); }
 
@@ -1569,7 +1569,7 @@ GtkCheckButton.text-button:selected {
       border-color: #151717;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(255, 255, 255, 0.14), inset 0 -1px #303535; }
     .scale.slider:insensitive {
-      background-image: linear-gradient(to bottom, #363a3a);
+      background-image: linear-gradient(to bottom, #323636);
       box-shadow: none; }
     .scale.slider:backdrop {
       border-color: #171a1a;
@@ -1605,7 +1605,7 @@ GtkCheckButton.text-button:selected {
         box-shadow: none; }
     .scale.trough:insensitive, .scale.trough.hilight:insensitive {
       border-color: #1c1f1f;
-      background-color: #363a3a;
+      background-color: #323636;
       box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
     .scale.trough:backdrop {
       border-color: #1e2222;
@@ -1678,16 +1678,16 @@ GtkLevelBar.vertical {
   background-color: transparent;
   border-style: solid;
   border-width: 1px;
-  background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+  background-image: linear-gradient(to bottom, #212121, #292929 90%);
   border-color: #1c1f1f;
-  box-shadow: inset 0 2px 2px -2px #191919, 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 2px 2px -2px #141414, 0 1px rgba(238, 238, 236, 0.1); }
   .level-bar.trough:backdrop {
     background-color: transparent;
     border-style: solid;
     border-width: 1px;
-    background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
+    background-image: linear-gradient(to bottom, #212121, #292929 90%);
     color: #c9cbc9;
-    background-image: linear-gradient(to bottom, #262626);
+    background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
 .level-bar.fill-block {
   border-width: 1px;
@@ -1724,7 +1724,7 @@ GtkLevelBar.vertical {
   background-color: #215d9c;
   color: white; }
   .view:backdrop:selected, .entry:backdrop:selected, .button:backdrop:selected {
-    color: #262626; }
+    color: #2c2c2c; }
 
 /**********
  * Frames *
@@ -1747,10 +1747,10 @@ GtkScrolledWindow GtkViewport.frame {
  * Lists *
  *********/
 .list {
-  background-color: #333333;
+  background-color: #292929;
   border-color: #1c1f1f; }
   .list:backdrop {
-    background-color: #262626;
+    background-color: #2c2c2c;
     border-color: #1e2222; }
 
 /*********************
@@ -1783,14 +1783,14 @@ GtkCalendar {
   border: 1px solid #1c1f1f; }
   GtkCalendar.button {
     padding: 0 4px;
-    color: #272929;
+    color: #222424;
     background-image: none;
     background-color: transparent; }
     GtkCalendar.button:hover {
       background-image: none;
       color: #eeeeec; }
     GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover {
-      color: #222424;
+      color: #252727;
       background-image: none; }
 
 /***********
@@ -1837,7 +1837,7 @@ GtkMessageDialog .titlebar {
     border-style: solid;
     color: #939695;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #363a3a);
+    background-image: linear-gradient(to bottom, #323636);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1963,7 +1963,7 @@ GtkInfoBar {
       border-style: solid;
       color: #939695;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #363a3a);
+      background-image: linear-gradient(to bottom, #323636);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-- 
2.30.2